lib: Two more compiler warning fixes
authorColin Walters <walters@verbum.org>
Tue, 23 Feb 2016 02:11:10 +0000 (21:11 -0500)
committerColin Walters <walters@verbum.org>
Tue, 23 Feb 2016 02:11:10 +0000 (21:11 -0500)
src/libostree/ostree-repo-libarchive.c
src/libostree/ostree-repo.c

index b21e222c562a4e92e86374f59f97b51930c92de6..1c0515922a0cb07bff9018934cb6d66109b06c5c 100644 (file)
@@ -640,7 +640,7 @@ write_directory_to_libarchive_recurse (OstreeRepo               *self,
                   if (r != bytes_read)
                     {
                       propagate_libarchive_error (error, a);
-                      g_prefix_error (error, "Failed to write %" G_GUINT64_FORMAT " bytes (code %" G_GUINT64_FORMAT"): ", (guint64)bytes_read, r);
+                      g_prefix_error (error, "Failed to write %" G_GUINT64_FORMAT " bytes (code %" G_GUINT64_FORMAT"): ", (guint64)bytes_read, (guint64)r);
                       goto out;
                     }
                 }
index 1e9673d17744538b3fd31f965c3a5f67e05537f6..3b08d445f3e70a8a0da603e28fa3ed86da88fe15 100644 (file)
@@ -4604,8 +4604,8 @@ ostree_repo_regenerate_summary (OstreeRepo     *self,
         gs_free char *from = NULL;
         gs_free char *to = NULL;
         gs_free guchar *csum = NULL;
-        gs_free char *superblock;
-        gs_fd_close int superblock_file_fd;
+        gs_free char *superblock = NULL;
+        gs_fd_close int superblock_file_fd = -1;
         g_autoptr(GInputStream) in_stream = NULL;
 
         _ostree_parse_delta_name (delta_names->pdata[i], &from, &to);